Several last-minute fixes

diff --git a/modules/engines/ms-windows/ChangeLog.old b/modules/engines/ms-windows/ChangeLog.old
index 3cc682b46b9027dc4a3c49d1e2c0fb27a5a609b8..467e844f4224b0d930cafcf1ccb04ca5af501263 100755 (executable)
--- a/modules/engines/ms-windows/ChangeLog.old
+++ b/modules/engines/ms-windows/ChangeLog.old
@@ -1,8 +1,16 @@
+2003-09-15  Raymond Penners  <raymond@dotsphinx.com>\r
+\r
+       * src/wimp_style.c: Fixed typ-o (gtk-double-cliNk-time), adjusted\r
+       cursor blink time to cope with Windows semantics (GTK+ uses cycle\r
+       time), fixed clipping area computation.\r
+       \r
 2003-09-15  Dom Lachowicz <cinamod@hotmail.com>\r
 \r
-       * src/wimp_style.c: Fix a few more console messages, implement caret blinking\r
-       * src/xp_theme.*: Stub out line drawing. Apparently, documented bits arae missing\r
-       from MS's implementation. Go figure...\r
+       * src/wimp_style.c: Fix a few more console messages, implement\r
+       caret blinking\r
+       \r
+       * src/xp_theme.*: Stub out line drawing. Apparently, documented\r
+       bits are missing from MS's implementation. Go figure...\r
        \r
 2003-09-14  Raymond Penners  <raymond@dotsphinx.com>\r
 \r
@@ -10,7 +18,7 @@
        "default_border".\r
        \r
        * src/wimp_style.c: Due to a bug lots of console message\r
-       complaining about "unexpected keyword `fg'" and occured, fixed.\r
+       complaining about "unexpected keyword `fg'" occured, fixed.\r
 \r
 2003-09-11  Dom Lachowicz <cinamod@hotmail.com>\r
 \r

diff --git a/modules/engines/ms-windows/wimp_style.c b/modules/engines/ms-windows/wimp_style.c
index cb85c2b6ae97713df456f4997bdf6677108fae93..62d6fca1846357af213ff4546f32868b435c8014 100755 (executable)
--- a/modules/engines/ms-windows/wimp_style.c
+++ b/modules/engines/ms-windows/wimp_style.c
@@ -223,10 +223,10 @@ setup_system_settings (GtkStyle * style)
   if (cursor_blink_time > 0)
   {
        g_object_set (G_OBJECT (settings), "gtk-cursor-blink-time",
-                                       cursor_blink_time, NULL);
+                                       2*cursor_blink_time, NULL);
   }
 
-  g_object_set (G_OBJECT (settings), "gtk-double-clink-time",
+  g_object_set (G_OBJECT (settings), "gtk-double-click-time",
                GetDoubleClickTime(), NULL);
   g_object_set (G_OBJECT (settings), "gtk-dnd-drag-threshold",
                GetSystemMetrics (SM_CXDRAG), NULL);

diff --git a/modules/engines/ms-windows/xp_theme.c b/modules/engines/ms-windows/xp_theme.c
index 7b51921962ee114aed7a6752509c7c69dfdc781e..b43b2bd8cd2971bc81e66d3c8f83293151c24af5 100755 (executable)
--- a/modules/engines/ms-windows/xp_theme.c
+++ b/modules/engines/ms-windows/xp_theme.c
@@ -612,8 +612,8 @@ xp_theme_draw(GdkWindow *win, XpThemeElement element, GtkStyle *style,
     {
       clip.left = area->x - xoff;
       clip.top = area->y - yoff;
-      clip.right = rect.left + area->width;
-      clip.bottom = rect.top + area->height;
+      clip.right = clip.left + area->width;
+      clip.bottom = clip.top + area->height;
 
       pClip = &clip;
     }